MErge with xenppc-unstable-merge.hg
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Fri, 28 Jul 2006 09:51:38 +0000 (10:51 +0100)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Fri, 28 Jul 2006 09:51:38 +0000 (10:51 +0100)

Trivial merge